From acfe512ae8f48745eda5c5a414ea367af34e186b Mon Sep 17 00:00:00 2001
From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Mon, 2 Feb 2009 13:01:32 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11ebf1773a4..f47424736ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* smerge-mode.el (smerge-start-session): Add interactive spec.
+
 2009-02-02  Glenn Morris  <rgm@gnu.org>
 
 	* mail/rmail.el (rmail-ignored-headers, rmail-displayed-headers)
-- 
2.30.2